From 7ae675b4695c4be3bb860c1f80c86a489fdeaf59 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Mon, 6 May 2019 20:09:03 +0200
Subject: [PATCH] build: Install the backend headers in the backend directories

That's where they are in the sources and we include them from other
headers. So make sure the directories match.
---
 gdk/broadway/meson.build | 3 +--
 gdk/quartz/meson.build   | 3 +--
 gdk/wayland/meson.build  | 3 +--
 gdk/win32/meson.build    | 3 +--
 gdk/x11/meson.build      | 3 +--
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/gdk/broadway/meson.build b/gdk/broadway/meson.build
index 590440ace0..92189ec270 100644
--- a/gdk/broadway/meson.build
+++ b/gdk/broadway/meson.build
@@ -25,8 +25,7 @@ gdk_broadway_public_headers = [
 ]
 
 # Broadway backend headers aren't installed it seems
-#install_headers(gdk_broadway_public_headers, subdir: 'gtk-4.0/gdk/broadway/')
-#install_headers('gdkbroadway.h', subdir: 'gtk-4.0/gdk/')
+#install_headers(gdk_broadway_public_headers, 'gdkbroadway.h', subdir: 'gtk-4.0/gdk/broadway/')
 
 gdk_broadway_deps = [shmlib]
 
diff --git a/gdk/quartz/meson.build b/gdk/quartz/meson.build
index dabeb6b5b6..0575bb99a6 100644
--- a/gdk/quartz/meson.build
+++ b/gdk/quartz/meson.build
@@ -33,8 +33,7 @@ gdk_quartz_public_headers = files([
   'gdkquartzsurface.h',
 ])
 
-install_headers(gdk_quartz_public_headers, subdir: 'gtk-4.0/gdk/quartz/')
-install_headers('gdkquartz.h', subdir: 'gtk-4.0/gdk/')
+install_headers(gdk_quartz_public_headers, 'gdkquartz.h', subdir: 'gtk-4.0/gdk/quartz/')
 
 gdk_quartz_deps = [ # FIXME
 ]
diff --git a/gdk/wayland/meson.build b/gdk/wayland/meson.build
index 40f08bdd88..f40fe3b415 100644
--- a/gdk/wayland/meson.build
+++ b/gdk/wayland/meson.build
@@ -26,8 +26,7 @@ gdk_wayland_public_headers = files([
   'gdkwaylandsurface.h'
 ])
 
-install_headers(gdk_wayland_public_headers, subdir: 'gtk-4.0/gdk/wayland/')
-install_headers('gdkwayland.h', subdir: 'gtk-4.0/gdk/')
+install_headers(gdk_wayland_public_headers, 'gdkwayland.h', subdir: 'gtk-4.0/gdk/wayland/')
 
 gdk_wayland_deps = [
   shmlib,
diff --git a/gdk/win32/meson.build b/gdk/win32/meson.build
index 45915f2a8f..11f8da78b2 100644
--- a/gdk/win32/meson.build
+++ b/gdk/win32/meson.build
@@ -42,8 +42,7 @@ gdk_win32_public_headers = files([
   'gdkwin32surface.h',
 ])
 
-install_headers(gdk_win32_public_headers, subdir: 'gtk-4.0/gdk/win32/')
-install_headers('gdkwin32.h', subdir: 'gtk-4.0/gdk/')
+install_headers(gdk_win32_public_headers, 'gdkwin32.h', subdir: 'gtk-4.0/gdk/win32/')
 
 gdk_win32_deps = [ # FIXME
     pangowin32_dep
diff --git a/gdk/x11/meson.build b/gdk/x11/meson.build
index 03d314feef..06d6d8b497 100644
--- a/gdk/x11/meson.build
+++ b/gdk/x11/meson.build
@@ -54,8 +54,7 @@ gdk_x11_public_headers = files([
   'gdkx11surface.h',
 ])
 
-install_headers(gdk_x11_public_headers, subdir: 'gtk-4.0/gdk/x11/')
-install_headers('gdkx.h', subdir: 'gtk-4.0/gdk/')
+install_headers(gdk_x11_public_headers, 'gdkx.h', subdir: 'gtk-4.0/gdk/x11/')
 
 gdk_x11_deps = [
   xrender_dep,
-- 
2.30.2